diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
index c53f439..119ead4 100644
--- a/configs/omap3_evm_defconfig
+++ b/configs/omap3_evm_defconfig
@@ -37,10 +37,9 @@
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SPL_DM=y
+# CONFIG_SPL_BLK is not set
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x82000000
-CONFIG_BLK=y
-# CONFIG_SPL_BLK is not set
 CONFIG_DM_MMC=y
 # CONFIG_SPL_DM_MMC is not set
 CONFIG_MMC_OMAP_HS=y
@@ -53,7 +52,6 @@
 CONFIG_SMC911X=y
 CONFIG_SMC911X_BASE=0x2C000000
 CONFIG_SMC911X_32_BIT=y
-CONFIG_CONS_INDEX=1
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index 964e9b9..36659cb 100644
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -46,7 +46,6 @@
 CONFIG_SMC911X=y
 CONFIG_SMC911X_BASE=0x08000000
 CONFIG_SMC911X_32_BIT=y
-CONFIG_CONS_INDEX=1
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index bd264d2..1a5606d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -309,7 +309,6 @@
 CONFIG_D2NET_V2
 CONFIG_DA850_AM18X_EVM
 CONFIG_DA850_EVM_MAX_CPU_CLK
-CONFIG_DBAU1000
 CONFIG_DBGU
 CONFIG_DBG_MONITOR
 CONFIG_DB_784MP_GP
@@ -616,7 +615,6 @@
 CONFIG_FIXED_SDHCI_ALIGNED_BUFFER
 CONFIG_FLASHBOOTCOMMAND
 CONFIG_FLASHCARD
-CONFIG_FLASH_16BIT
 CONFIG_FLASH_BASE
 CONFIG_FLASH_BR_PRELIM
 CONFIG_FLASH_CFI_DRIVER
@@ -1440,9 +1438,6 @@
 CONFIG_PALMAS_SMPS7_FPWM
 CONFIG_PALMAS_USB_SS_PWR
 CONFIG_PARAVIRT
-CONFIG_PB1000
-CONFIG_PB1100
-CONFIG_PB1500
 CONFIG_PCA953X
 CONFIG_PCA9698
 CONFIG_PCI1
@@ -1827,11 +1822,6 @@
 CONFIG_SMSTP8_ENA
 CONFIG_SMSTP9_ENA
 CONFIG_SOCRATES
-CONFIG_SOC_AU1000
-CONFIG_SOC_AU1100
-CONFIG_SOC_AU1500
-CONFIG_SOC_AU1550
-CONFIG_SOC_AU1X00
 CONFIG_SOC_DM355
 CONFIG_SOC_DM365
 CONFIG_SOC_DM644X
@@ -3963,9 +3953,6 @@
 CONFIG_SYS_PCI_TBATR4
 CONFIG_SYS_PCI_TBATR5
 CONFIG_SYS_PCI_VIRT
-CONFIG_SYS_PCMCIA_ATTR_BASE
-CONFIG_SYS_PCMCIA_IO_BASE
-CONFIG_SYS_PCMCIA_MEM_ADDR
 CONFIG_SYS_PCMCIA_MEM_SIZE
 CONFIG_SYS_PDCNT
 CONFIG_SYS_PEHLPAR
@@ -4071,9 +4058,6 @@
 CONFIG_SYS_QRIO_OR_PRELIM
 CONFIG_SYS_R7780MP_OLD_FLASH
 CONFIG_SYS_RAMBOOT
-CONFIG_SYS_RAM_BASE
-CONFIG_SYS_RAM_CS
-CONFIG_SYS_RAM_FREQ_DIV
 CONFIG_SYS_RCAR_I2C0_BASE
 CONFIG_SYS_RCAR_I2C1_BASE
 CONFIG_SYS_RCAR_I2C2_BASE
@@ -4615,7 +4599,6 @@
 CONFIG_USB_FREQ
 CONFIG_USB_GADGET_AMD5536UDC
 CONFIG_USB_GADGET_AT91
-CONFIG_USB_GADGET_AU1X00
 CONFIG_USB_GADGET_DUMMY_HCD
 CONFIG_USB_GADGET_DWC2_OTG_PHY
 CONFIG_USB_GADGET_FOTG210
@@ -4633,7 +4616,6 @@
 CONFIG_USB_GADGET_PXA2XX
 CONFIG_USB_GADGET_SA1100
 CONFIG_USB_GADGET_SUPERH
-CONFIG_USB_GADGET_SX2
 CONFIG_USB_HOST_XHCI_BASE
 CONFIG_USB_INVENTRA_DMA
 CONFIG_USB_ISP1301_I2C_ADDR
@@ -4641,7 +4623,6 @@
 CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 CONFIG_USB_MUSB_TIMEOUT
 CONFIG_USB_MUSB_TUSB6010
-CONFIG_USB_OHCI
 CONFIG_USB_OHCI_EP93XX
 CONFIG_USB_OHCI_LPC32XX
 CONFIG_USB_OHCI_NEW